Merge branch 'deb/emacs23/d/sid/upstream' into deb/emacs23/d/sid/master
authorRob Browning <rlb@defaultvalue.org>
Sat, 8 May 2010 03:29:02 +0000 (22:29 -0500)
committerRob Browning <rlb@defaultvalue.org>
Sat, 8 May 2010 03:29:02 +0000 (22:29 -0500)
commit1f60a64ee303a6897fa46e1acc92289c854313f6
tree77036f3fe258459ef13b00e92b019fe8070ada73
parent31b00cf500d18f31c171f580c2de9b6997f66376
parent2fe1e45581c037e7a4318690565a826355763aed
Merge branch 'deb/emacs23/d/sid/upstream' into deb/emacs23/d/sid/master